From 0290b28564dc30c42bb9ad354b87e68a803340b0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 9 Jan 2018 23:16:30 -0500
Subject: [PATCH] Drop unused debug keys

The multihead, xim and xinerama keys do nothing anymore.
---
 docs/reference/gtk/running.sgml |  8 --------
 gdk/gdk.c                       |  3 ---
 gdk/gdkinternals.h              | 23 ++++++++++-------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
index 70de484a38..8f6d2936be 100644
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -306,14 +306,6 @@ nevertheless.
       <term>nograbs</term>
       <listitem><para>Turn off all pointer and keyboard grabs</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>xinerama</term>
-      <listitem><para>Simulate a multi-monitor setup</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>xim</term>
-      <listitem><para>Information about XIM support</para></listitem>
-    </varlistentry>
 
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 28eb0fe97a..107e88b9ee 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -156,12 +156,9 @@ static const GDebugKey gdk_debug_keys[] = {
   { "events",        GDK_DEBUG_EVENTS },
   { "misc",          GDK_DEBUG_MISC },
   { "dnd",           GDK_DEBUG_DND },
-  { "xim",           GDK_DEBUG_XIM },
   { "nograbs",       GDK_DEBUG_NOGRABS },
   { "input",         GDK_DEBUG_INPUT },
   { "cursor",        GDK_DEBUG_CURSOR },
-  { "multihead",     GDK_DEBUG_MULTIHEAD },
-  { "xinerama",      GDK_DEBUG_XINERAMA },
   { "eventloop",     GDK_DEBUG_EVENTLOOP },
   { "frames",        GDK_DEBUG_FRAMES },
   { "settings",      GDK_DEBUG_SETTINGS },
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index dde2c539e2..3e90979237 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -60,19 +60,16 @@ typedef enum {
   GDK_DEBUG_MISC          = 1 <<  0,
   GDK_DEBUG_EVENTS        = 1 <<  1,
   GDK_DEBUG_DND           = 1 <<  2,
-  GDK_DEBUG_XIM           = 1 <<  3,
-  GDK_DEBUG_NOGRABS       = 1 <<  4,
-  GDK_DEBUG_INPUT         = 1 <<  5,
-  GDK_DEBUG_CURSOR        = 1 <<  6,
-  GDK_DEBUG_MULTIHEAD     = 1 <<  7,
-  GDK_DEBUG_XINERAMA      = 1 <<  8,
-  GDK_DEBUG_EVENTLOOP     = 1 <<  9,
-  GDK_DEBUG_FRAMES        = 1 << 10,
-  GDK_DEBUG_SETTINGS      = 1 << 11,
-  GDK_DEBUG_OPENGL        = 1 << 12,
-  GDK_DEBUG_VULKAN        = 1 << 13,
-  GDK_DEBUG_SELECTION     = 1 << 14,
-  GDK_DEBUG_CLIPBOARD     = 1 << 15
+  GDK_DEBUG_NOGRABS       = 1 <<  3,
+  GDK_DEBUG_INPUT         = 1 <<  4,
+  GDK_DEBUG_CURSOR        = 1 <<  5,
+  GDK_DEBUG_EVENTLOOP     = 1 <<  6,
+  GDK_DEBUG_FRAMES        = 1 <<  7,
+  GDK_DEBUG_SETTINGS      = 1 <<  8,
+  GDK_DEBUG_OPENGL        = 1 <<  9,
+  GDK_DEBUG_VULKAN        = 1 << 10,
+  GDK_DEBUG_SELECTION     = 1 << 11,
+  GDK_DEBUG_CLIPBOARD     = 1 << 12
 } GdkDebugFlag;
 
 typedef enum {
-- 
2.30.2